music
music
resolve merge comflicts
Merge branch 'gh-pages' of https://github.com/bronte-a/flappy-bird into gh-pages

Conflicts:
	menu.js
	play.js