register fixed
Merge branch 'master' of https://bitbucket.org/m1samuel/place-its

Conflicts:
	src/com/cse110team14/placeit/controller/RegisterController.java
merged
changed
Merge branch 'master' of https://bitbucket.org/m1samuel/place-its

Conflicts:
	src/com/cse110team14/placeit/controller/RegisterController.java