Syncing controllers, adding RCMP and Gibbons
Merge branch 'master' of https://github.com/bradders/hackAPI

Conflicts:
	app/routes.php