Revert "Merge branch 'master' of https://github.com/evanmcc92/JustSayin"

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