Dummy
Dummy
Dummy
Merge branch 'sign-up'

Conflicts:
	app/models/user.rb
Dummy