Damn boy! Made an enemy and a buggy collision detecter....
Merge remote-tracking branch 'origin/master'

Conflicts:
	build/classes/mygame/Alien.class
	build/classes/mygame/Main$1.class
	build/classes/mygame/Main$2.class
	build/classes/mygame/Main.class
	build/classes/mygame/Weapon.class
	src/mygame/Alien.java
	src/mygame/Main.java
	src/mygame/Weapon.java