meh
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/LegoMap/GUI.java
WE DONT NEED ANOTHER JFRAME