change: winners to hall of fame
Merge branch 'master' of https://github.com/sean-elder/yourastar

Conflicts:
	app/views/layouts/application.html.erb
fix merge errors