I did some things...
Merge remote-tracking branch 'origin/master'

Conflicts:
	build/classes/mygame/Enemy.class
	build/classes/mygame/Main.class
	src/mygame/Enemy.java
	src/mygame/Main.java