Merge remote-tracking branch 'origin/master'

Conflicts:
	core/src/com/missionbit/snailassalt/SnailAssalt.java
	core/src/com/missionbit/snailassalt/player.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	core/src/com/missionbit/snailassalt/SnailAssalt.java
	core/src/com/missionbit/snailassalt/player.java
Merge branch 'master' into lin's
wtf milo