Init commit
Merge branch 'master' of https://github.com/BorjaL/7pavosDFanta

Conflicts:
	.gitignore