Merge branch 'responsive' of https://github.com/hlmason/musiclaps2 into firefox
Merge branch 'firefox' of https://github.com/hlmason/musiclaps2 into projects