Schema.
Merge branch 'master' of https://github.com/Agalin/RailsRegistrationForm

Conflicts:
	db/schema.rb