fixes
Merge branch 'master' of github.com:giveydev/runner-giver

Conflicts:
	app/views/me/show.html.erb
resolved conflict