OMGF!!
Merge branch 'develop' of https://github.com/thortek/dgm4790-spring2014

Conflicts:
	thors-code.js
Merge pull request #3 from thortek/tyler-2.7-auth

Update base develop branch - Area to work in
Added web-server.js file for node
Revert "Added web-server.js file for node"

This reverts commit 9295a19c205b1de6321dc3432331220343876795.
Added json events model, test data service, test data controller, binding in dean-home.html view, and web-server.js for node
Merge pull request #4 from thortek/james-1.0.3-tempdata

James 1.0.3 tempdata
Merge branch 'james-mergetest' into develop

* james-mergetest:
  Added json events model, test data service, test data controller, binding in dean-home.html view, and web-server.js for node
  OMGF!!