removed excess functions from server.js
Merge pull request #70 from kmeurer/master

Remove excess functions from server.js
Merge branch 'master' of https://github.com/germTheory/germTheoryWebApp into grunt

Conflicts:
	server/server.js