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
new house class + new enemies
new house class + new enemies
new house class + new enemies
Merge branch 'enemies' of https://github.com/MissionBit/SnailAssalt into enemies
remove crap
Merge remote-tracking branch 'origin/enemies' into GETit

Conflicts:
	core/src/com/missionbit/snailassalt/SnailAssalt.java
	core/src/com/missionbit/snailassalt/player.java
snail can now attack house and time thingy got somehow fixed .thank you Hurshal