moved node event handler back to main server controller
Merge branch 'master' of github.com:MakersSpark/Maker-Spark-Server
add calander json spec and add refactor calander to add events on initialization
fix merge conflict in calander
add todays_events_hashed to calander
Guardian news feed feature returns formatted date, all tests passed
Merge branch 'development' of github.com:MakersSpark/Maker-Spark-Server into development
add json method to git hub and improve exsting tests
removed mean message about Ben
Merge branch 'development' of github.com:MakersSpark/Maker-Spark-Server into development
Merging branches
add popular tweets to message model
fixed merge conflict
Fixed failing tests -- sorry gaise :blush:
Merge branch 'development' of github.com:MakersSpark/Maker-Spark-Server into development
Guardian news feed feature returns formatted date and time, all tests passed
Add check to prevent guests accessing the edit user page
add addGitData method to myApp.js
Merge branch 'development' of github.com:MakersSpark/Maker-Spark-Server into development
Guardian news feed feature returns formatted date and time, all tests passed