Fix auth
Merge branch 'master' of https://github.com/nails/nails-api

Conflicts:
	index.js