.
Merge branch 'master' of https://github.com/MissionBit/SnailAssalt

Conflicts:
	core/src/com/missionbit/snailassalt/SnailAssalt.java
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of https://github.com/MissionBit/SnailAssalt

Conflicts:
	core/src/com/missionbit/snailassalt/SnailAssalt.java
Merge branch 'master' of https://github.com/MissionBit/SnailAssalt

Conflicts:
	core/src/com/missionbit/snailassalt/SnailAssalt.java
Jimmy on right side of screen