gui
Merge branch 'master' of https://github.com/ProjectKT/Rep6.git

Conflicts:
	Rep6/src/gui/gui.java
	Rep6/src/gui/test.java