don't know qhat am I doing
Merge branch 'master' of https://github.com/marirq/git_mapa

Conflicts:
	.gitignore