update to master
Merge branch 'gh-pages' of https://github.com/fatsmcgee/MusicMappr into gh-pages