rename server.js to app.js
Merge branch 'master' of github.com:cybermarkus1/angular-routing