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
add json method to git hub and improve exsting tests
add addGitData method to myApp.js
Merge branch 'development' of github.com:MakersSpark/Maker-Spark-Server into development
update github
Merge branch 'development' of github.com:MakersSpark/Maker-Spark-Server into development