lol why am i loading js?
Merge branch 'master' into gh-pages