Just buttons
Merge branch 'master' of https://github.com/lanatra/Lego-Project

Conflicts:
	src/LegoMap/GUI.java