Minor Changes
Merge branch 'master' of https://github.com/nchen94/CEN3031Project

Conflicts:
	Hummingbird/public/modules/lab/tests/verify.client.controller.test.js