merged

Signed-off-by: Froilan <froilan.co@orangeandbronze.com>
Merge branch 'master' of https://github.com/Monopond/fax-api

Conflicts:
	README.md

Signed-off-by: Froilan <froilan.co@orangeandbronze.com>