Initial commit
Merge branch 'master' of github.com:pcollaog/rest-in-peace into develop

Signed-off-by: Francisco Collao <pcollaog@gmail.com>

Conflicts:
	.gitignore