added comments
fixed merge
added server testing in spec folder
Merge pull request #27 from myclamm/master

Added Mocha Testing for server in spec folder