spring cleaning
Merge branch 'master' of heroku.com:bearcampruby

Conflicts:
	Gemfile.lock
gemfile updates
Merge branch 'master' of heroku.com:bearcampruby

Conflicts:
	Gemfile.lock