a
Merge branch 'master' of https://github.com/Tlahuica/MiacatlanBlues

Conflicts:
	.gitignore