Production snapshot
Merge branch 'master' of github.com:Orasi/code-challenge-grading

Conflicts:
	app/views/march/2014/silver.html.erb