Merge branch 'master' into gh-pages
Merge branch 'convert-everything-to-angular' into gh-pages
Merge branch 'add-chord-selector' into gh-pages
chord editing now syncs
Merge branch 'add-chord-selector' into gh-pages
Merge branch 'gh-pages'