setup server file and additional node dependencies
Merge branch 'master' of https://github.com/warring-hail/greenfield

Conflicts:
	package.json
middleware and server setup
Merge branch 'master' of https://github.com/mlom/greenfield into mlom-master

Conflicts:
	package.json
	server/config/middleware.js
	server/server.js
Merge branch 'mlom-master'
Merge pull request #28 from dduugg/mlom-master

Mlom master merged