Merge branch 'master' into angular
fixing conflicts
Merge branch 'master' into angular
dummy test data
Merge branch 'master' into angular
Merge branch 'master' into angular
event page, loc page, locations index receiving data from mongo
merge conflict in json file resolved
Merge pull request #6 from bchiatt/angular

Angular