Git Ignore updated
Merge branch 'master' of github.com:0w3w/casasqueretaroapp

Conflicts:
	.gitignore