b4 merge
Merge branch 'master' of https://github.com/beanfarmer/pixiRacer

Conflicts:
	index.html
cleanup after merge