Import source code
added basic lockups
Merge pull request #1 from Ch4s3/lock_up

added basic lockups
Merge branch 'master' of heroku.personal:bikestack

Conflicts:
	app.json
	config/routes.rb
	db/schema.rb
removed confirmable
Merge pull request #2 from Ch4s3/fix_email_auth

Fix email auth
brain tree first pass
the fix