Fix gems
Merge branch 'master' of github.com:fjordllc/interns

Conflicts:
	Gemfile.lock
Fix merge mark