Merge branch 'master' of https://github.com/TotalMediaGroup/tmg-node-express

Conflicts:
	data/work.js
Changes