Fixed
Merge branch 'master' of github.com:fueledbymarvin/hush
Merge branch 'master' of github.com:fueledbymarvin/hush

Conflicts:
	api/controllers/MessageController.js
Merge branch 'master' of github.com:fueledbymarvin/hush
check
Routing works
Merge branch 'master' of github.com:fueledbymarvin/hush