more tweeking
Merge branch 'master' of https://github.com/Daiwen/ludum-08-2014

Conflicts:
	core/src/com/ludum/entity/player/Player.java