Show conflicts
Merge branch 'master' of https://github.com/crowdpublishtv/teamawesome

Conflicts:
	app/views/users/show.html.erb