changed beat count thing
Merge branch 'master' into gh-pages
updating assets