Update Index.html, include app.js
Merge origin/master