Merge branch 'master' into angular
fixing conflicts
Merge branch 'master' into angular
dummy test data
Merge branch 'master' into angular
Merge pull request #4 from bchiatt/kaydb

added data to events.json
updated models
Merge pull request #5 from bchiatt/models

updated models
Merge branch 'master' into angular
historic locations added
Merge branch 'master' of https://github.com/bchiatt/enlighTN
event page, loc page, locations index receiving data from mongo
merge conflict in json file resolved
Metro Installations
locations index page displaying
Merge pull request #6 from bchiatt/angular

Angular
Merge pull request #7 from bchiatt/angular

locations index page displaying
Merge pull request #8 from bchiatt/db

Metro Installations
fixed merge conflicts in two json files