Merging
Merge branch 'frontend' of https://github.com/dkellis42/COdeWORK into frontend

Conflicts:
	config/express.js
	public/modules/core/controllers/home.client.controller.js