pulling
Merge branch 'master' of https://github.com/jcburke14/dugong

Conflicts:
	app/controllers/users_controller.rb