Merge branch 'master' of https://github.com/Gebuz/Group-B

Conflicts:
	GuiDrawLines/QuadTree.java
	GuiDrawLines/QuadTreeGuiTest.java