Just bug fixes and UI tweaks, no new features here.
Merge branch 'master' of github.com:Little-Big-Co/The-Challenge

Conflicts:
	app/views/users/show.html.erb
	config/routes.rb