s
Merge branch 'master' of https://github.com/mcfun/mccunn-music

Conflicts:
	css/bootstrap.css
	index.html