Merge branch 'master' of https://github.com/DJCubed/shindig
Merge branch 'master' of https://github.com/DJCubed/shindig
remove app.js from gruntfile