a
Merge branch 'master' of https://github.com/NishantBisen/OOADProject

Conflicts:
	COEN275Project/src/com/project/views/AdminViewGui.java
	COEN275Project/src/com/project/views/ProjectDetailsForm.java
	COEN275Project/src/com/project/views/ViewerGUI.java
	COEN275Project/src/com/project/views/ViewerProjectDetailsForm.java