Updates gems
Merge branch 'master' of github.com:StartupWeekend/program-site-base

Conflicts:
	Gemfile.lock