Changes
Merge branch 'master' of https://github.com/sean-elder/yourastar

Conflicts:
	app/views/winners/index.html.erb