first commit
changed css element from 'prizes' to 'timeline'
Merge branch 'master' of heroku.com:sigdon

Conflicts:
	app/views/shared/_participation.html.erb
	config/application.rb
	public/stylesheets/application.css