User signup done
Merge branch 'signing-up'

Conflicts:
	app/views/layouts/application.html.erb
	app/views/users/new.html.erb
	log/development.log