Added web-server.js file for node
Revert "Added web-server.js file for node"

This reverts commit 9295a19c205b1de6321dc3432331220343876795.
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!!
Tyler-1.0.3-TempData | Modified services to return a deffered object s we are not reliant on controllers.
added ng-class grey
Created logos for dean's radar
Added entry
Delete all idea files
deleted .idea files
Merge branch 'develop' of https://github.com/thortek/dgm4790-spring2014 into develop
Merge branch 'develop' into tyler-2.7-auth

* develop:
  Delete all idea files
  Created logos for dean's radar
  added ng-class grey

Conflicts:
	www/js/controllers.js
	www/templates/dean-home.html
Merge pull request #6 from thortek/tyler-2.7-auth

Updated Controllers to read from services, services pass in deferred object.
fixed merge problems from class
fixed grey class
Added icons for different departments.
Updated .gitignore to now try and upload /myApp/ folder
Merge pull request #8 from thortek/joe-1.0.2-icons

Added icons for different departments.
Added to .gitignore
Merge branch 'develop' of github.com:thortek/dgm4790-spring2014 into develop

# By TylersDesk (1) and others
# Via TylersDesk (1) and joehafen (1)
* 'develop' of github.com:thortek/dgm4790-spring2014:
  Updated .gitignore to now try and upload /myApp/ folder
  Added icons for different departments.
  fixed grey class
Stop tracking these files