Fixed things... or not...
FUCK THIS
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/mygame/Main.java
	src/mygame/Map.java