Merge branch 'master' of gitlab.fsi.hochschule-trier.de:GameDevWeek/ws-18_19/unity/suck-it
# Conflicts: # Assets/_Game/Data/Player Data/Movement Data/Movement States.asset
This diff is collapsed.
# Conflicts: # Assets/_Game/Data/Player Data/Movement Data/Movement States.asset