changes to index and app.js
merge conflicts fixed
Merge pull request #25 from billy1339/master

merg