stuff
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/users/new.html.erb