adds minified js files
merges some stuff
Merge branch 'master' of github.com:gmmeyer/gmmeyer.github.io