mas al ignore
Merge branch 'master' of https://github.com/aniPerezG/barbalpha

Conflicts:
	.gitignore