Update

update
Merge branch 'master' of https://github.com/191-Group-4/partner

Conflicts:
	app/controllers/users_controller.rb