Additions to Users
Merge branch 'master' of https://github.com/scburns123/event

Conflicts:
	config/routes.rb