Merge pull request #17 from thatcoderguy/master

Merge pull request #18 from widagroup/master
Merge pull request #18 from thatcoderguy/master

merge changes
Implemented signalR corrected + started to implement callbacks - need to write the javascript now.
Merge pull request #20 from widagroup/master

Implemented signalR corrected + started to implement callbacks - need to write the javascript now.