painting boxes!
Merge branch 'master' of https://github.com/Shne/LEGOLAB

Conflicts:
	Project-PC/src/LinesPanel.java