- sqlite
11
11
11
added authenticate.
user, pass
Merge branch 'master' of heroku.com:mighty-depths-8359

Conflicts:
	Gemfile.lock