Build files
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/build/classes/mygame/Main$1.class
	src/build/classes/mygame/Main.class