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

Conflicts:
	build/classes/META-INF/persistence.xml
	build/classes/UserRegistration/UserRegistrationTableModel.class
	src/META-INF/persistence.xml
	src/UserRegistration/UserRegistrationTableModel.java