app inicial
Merge branch 'master' of https://github.com/kalesis/miproyecto

Conflicts:
	.gitignore