Merge branch 'master' of git@github.com:FortPinnsvin/fallingman.git

Conflicts:
	core/src/com/FortPinnsvin/fallingman/GameView.java
Merge branch 'master' of git@github.com:FortPinnsvin/fallingman.git
Merge branch 'master' of git@github.com:FortPinnsvin/fallingman.git