displayproject
Merge branch 'master' of https://github.com/akashmalla/FrugalInnovationLabProject

Conflicts:
	build/classes/PanelsInGUI/GUI$1.class
	build/classes/PanelsInGUI/GUI$2.class
	build/classes/PanelsInGUI/GUI.class