Some physics changes
Merge branch 'master' of github.com:Hippocrates/colorgame

Conflicts:
	src/ggj14/cg/Player.java