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

Conflicts:
	core/src/com/missionbit/snailassalt/Enemy.java
	core/src/com/missionbit/snailassalt/SnailAssalt.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' of https://github.com/MissionBit/SnailAssalt into lin's

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

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

Conflicts:
	core/src/com/missionbit/snailassalt/SnailAssalt.java
	core/src/com/missionbit/snailassalt/player.java
.
.
add jimmys arm and stuffs
Merge branch 'master' into lin's
wtf milo
Updated build.gradle