Edit

Test
Merge branch 'master' of https://github.com/garyhsieh/dayr

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