Merge pull request #1 from pburge/gh-pages

merging gh-pages to master
commit to push. again
fixed merge issue with app.js