cambio el gitigno

se cambiaron por ello
Merge branch 'master' of https://github.com/iaogt/gtwebpos

Conflicts:
	.gitignore