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

Conflicts:
	package.json
fix middleware
Merge pull request #24 from dduugg/feature/fix-middleware

looks good
add angular-ui-router
middleware and server setup
Merge pull request #25 from dduugg/feature/add-ng-ui-router

added angular-ui-router to bower.json
Merge pull request #26 from rustinpc/master

Added angular app pledgr and set up state for home page with ui-router.
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