init commit
Merge branch 'master' of https://github.com/MachoSoftware/Proyecto-Pos

Conflicts:
	.gitignore