restructured app.js and main.js controller
Merge branch 'master' of https://github.com/revanthreddy/pumpkin