Merge pull request #40 from FarhadG/master

(/app) server up with angular and d3
added express to package.json
package.json change
changed routing in app.js
Merge pull request #41 from redwoodfavorite/master

Changed routing in app.js