basic order gui
Merge branch 'master' into darren

Conflicts:
	src/OrderGUI.java