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

Conflicts:
	build/classes/.gitignore
	build/classes/PanelsInGUI/GUI$1.class
	build/classes/PanelsInGUI/GUI$2.class
	build/classes/PanelsInGUI/GUI.class
	build/classes/ProjectManagement/ProjectManagementController.class
	build/classes/UserRegistration/UserRegistrationController.class
	build/classes/UserRegistration/UserRegistrationGUI$1.class
	build/classes/UserRegistration/UserRegistrationGUI$2.class
	build/classes/UserRegistration/UserRegistrationGUI$3.class
	build/classes/UserRegistration/UserRegistrationGUI$4.class
	build/classes/UserRegistration/UserRegistrationGUI$5.class
	build/classes/UserRegistration/UserRegistrationGUI$6.class
	build/classes/UserRegistration/UserRegistrationGUI$7.class
	build/classes/UserRegistration/UserRegistrationGUI.class
	src/PanelsInGUI/GUI.java
	src/UserRegistration/UserRegistrationGUI.java