merging
Merge branch 'master' of https://github.com/polenzdakota/SJSU-CS160-160ZAIBATSU

Conflicts:
	website/src/java/Controllers/UpdateUser.java