General Commit
Merge branch 'master' of https://github.com/nchen94/CEN3031Project

Conflicts:
	Hummingbird/app/controllers/orders.server.controller.js