chage routes
Make a basic User model(including secure passwords)
Finish user signup
finish signup
Merge branch 'signup'

Conflicts:
	app/views/layouts/application.html.erb
fix conflict