made changes
Merge branch 'master' of https://github.com/CMPUT301W14T02/Comput301Project

Conflicts:
	CMPUT301T02Project/src/ca/ualberta/cs/cmput301t02project/UserModel.java