first commit
Merge branch 'master' of github.com:Escuiquirin/Comunidad

Conflicts:
	.gitignore