no actual changes git is confused
Merge branch 'master' of github.com:audreycarlsen/sloth_express

Conflicts:
	app/controllers/users_controller.rb