modified:   main/nofutureball/src/nofutureball/Animatable.java
	modified:   main/nofutureball/src/nofutureball/Enemy.java
	modified:   main/nofutureball/src/nofutureball/Entity.java
	modified:   main/nofutureball/src/nofutureball/GameObject.java
	modified:   main/nofutureball/src/nofutureball/Room.java
	modified:   main/nofutureball/src/nofutureball/Wall.java
Merge branch 'master' of http://github.com/watacoso/nofutureball

Conflicts:
	main/nofutureball/src/nofutureball/Enemy.java

	new file:   main/nofutureball/src/nofutureball/AoEGuy.java
	new file:   main/nofutureball/src/nofutureball/Augmentation.java
	modified:   main/nofutureball/src/nofutureball/Container.java
	modified:   main/nofutureball/src/nofutureball/Enemy.java
	modified:   main/nofutureball/src/nofutureball/Entity.java
	modified:   main/nofutureball/src/nofutureball/Game.java
	modified:   main/nofutureball/src/nofutureball/GameObject.java
	new file:   main/nofutureball/src/nofutureball/Meele.java
	modified:   main/nofutureball/src/nofutureball/Player.java
	modified:   main/nofutureball/src/nofutureball/Room.java
	new file:   main/nofutureball/src/nofutureball/Sharpshooter.java
	modified:   main/nofutureball/src/nofutureball/Weapon.java