Remove unused reference to app.js
Merge pull request #37 from mkirvela/gh-pages

Remove unused reference to app.js
Resolve conflict