platform_collision_getting_there
Merge remote-tracking branch 'origin/platform_collision_getting_there'

Conflicts:
	src/smw/entity/Player.java
	src/smw/level/Level.java
	src/smw/level/MovingPlatform/MovingPlatform.java
Merge branch 'master' of https://github.com/mitch3a/SuperMarioWar.git