Merge branch 'gh-pages'

Conflicts:
	index.html
Merge branch 'master' of https://github.com/peterbekos/Bicycle-Race

Conflicts:
	index.html