Fixed captials and headers
Merge branch 'master' of github.com:SummerHoursHackathon/retrotacular

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