just to run the program... -Jude
Merge branch 'master' of github.com:Cyntwikip/ARIBA

Conflicts:
	GUI - Iteration 1/Dorm - GUI/build/classes/Viewer/GUI/MainMenu$1.class
	GUI - Iteration 1/Dorm - GUI/build/classes/Viewer/GUI/MainMenu$2.class
	GUI - Iteration 1/Dorm - GUI/build/classes/Viewer/GUI/MainMenu$3.class
	GUI - Iteration 1/Dorm - GUI/build/classes/Viewer/GUI/MainMenu$4.class
	GUI - Iteration 1/Dorm - GUI/build/classes/Viewer/GUI/MainMenu$5.class
	GUI - Iteration 1/Dorm - GUI/build/classes/Viewer/GUI/MainMenu$6.class
	GUI - Iteration 1/Dorm - GUI/build/classes/Viewer/GUI/MainMenu.class