new file:   db/local.0
	new file:   db/local.ns
	new file:   db/mongo_init.js
	new file:   db/mongod.lock
	new file:   db/testdb.0
	new file:   db/testdb.ns
	modified:   frontend-src/.tmp/concat/app.min.js
	modified:   frontend-src/app/features/base.controller.js
	modified:   frontend-src/app/features/homeview.html
	new file:   frontend-src/app/img/open-iconic.svg
	modified:   frontend-src/app/index.html
	modified:   frontend-src/app/services/RESTapi.js
	new file:   models/testModel.js
	modified:   package.json
	deleted:    routes/api.js
	new file:   routes/index.js
	new file:   routes/template_api.js
	modified:   server.js
	modified:   sockets/base.js
	deleted:    db/mongo_init.js
	modified:   frontend-src/app/features/base.controller.js
	modified:   frontend-src/app/features/homeview.html
	modified:   frontend-src/app/index.html
	modified:   frontend-src/app/services/RESTapi.js
	modified:   frontend-src/bower.json
	modified:   frontend-src/package.json
	modified:   models/testModel.js
	modified:   package.json
	modified:   routes/index.js
	modified:   routes/template_api.js
	modified:   server.js
	modified:   sockets/base.js
	new file:   config/config.js
	new file:   config/env/all.js
	new file:   config/env/development.js
	new file:   config/env/production.js
	new file:   config/express.js
	new file:   config/init.js
	new file:   config/mongo_init.js
Merge branch 'master' of https://github.com/adamhurst/DIRTyNodeSeed