quick commit 2014-05-31 16:05:41
Merge branch 'master' of heroku.com:trailheadit

Conflicts:
	Gemfile

fixed merge conflict; adjusted for having pg and sqlite3