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
Merge branch 'master' of https://github.com/MissionBit/SnailAssalt

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

Conflicts:
	core/src/com/missionbit/snailassalt/SnailAssalt.java
b.a.l.c.o.n.y:)
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
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
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
Gameover/win gamestates, new buttons, Jimmy's anatomy fixed, shop now branches out