roll back
Initial commit
merge users model
Merge branch 'modeling-users'
Merge branch 'master' into sign-up

Conflicts:
	app/helpers/application_helper.rb
	config/routes.rb
finish signup
add ssl to production
initial login stuff
Fininsh signin