Local commit
Merge branch 'master' of https://github.com/viandrada/GestionCN

Conflicts:
	README.md