Added startup.js and fixed app.js
Merge pull request #2 from robinweston/master

Added startup.js and fixed a few things in main.js