First Commit
Merge branch 'master' of github.com:sbarrat/proyect

Conflicts:
	.gitignore
First commit