Hopefully fixing gemfile merge conflicts
Hopefully fixing gemfile merge conflicts
Merge branch 'master' of https://github.com/crowdpublishtv/teamawesome

Conflicts:
	Gemfile.lock
Merge branch 'master' of https://github.com/crowdpublishtv/teamawesome

Conflicts:
	Gemfile
	Gemfile.lock