updated to upstream
removed remnants of conflict resolution
fixed a list
Merge pull request #79 from gerbal/gh-pages

Remove remnants of conflict resolution and fixed music.md markdown