some stuff
Merge branch 'master' of https://github.com/felamaslen/flappyworks

Conflicts:
	index.html