That was foolish

Conflicts:

	api/controllers/HooksController.js
Add in more infor to FAQ
ha