make a basic user model (including passwords)
finish user signup
fix untracked files
"try to fix merge"
Merge branch 'sign-up'

Conflicts:
	db/development.sqlite3
	log/development.log
	log/test.log
	tmp/cache/assets/development/sprockets/13fe41fee1fe35b49d145bcc06610705
	tmp/cache/assets/development/sprockets/1a66d8334bb82817e826dbeba46cf0cc
	tmp/cache/assets/development/sprockets/357970feca3ac29060c1e3861e2c0953
	tmp/cache/assets/development/sprockets/d6c7ce3ac277094b04690a43947ede22
	tmp/cache/assets/development/sprockets/d771ace226fc8215a3572e0aa35bb0d6
	tmp/cache/assets/development/sprockets/edbf63d87f211c17de329b8a471a7caf
	tmp/pids/server.pid
add ssl to production