changed results page
Merge branch 'master' of github.com:midgethoen/pick-your-favorite

Conflicts:
	result.html.gen