Make it so that we have error handling.
Merge branch 'development'

Conflicts:
	config/routes.js
	controllers/myController.coffee
	guts/routing.coffee