updates
Merge branch 'master' of https://github.com/atotalpirate/atotalpirate.github.io
front end js bug fix