- Swagger
- Custom HttpMessageConverter
Git Ignore
Merge branch 'master' of https://github.com/nicolp/terreno

Conflicts:
	.gitignore
- Cambio de estado