Ignore list update
Merge branch 'master' of https://github.com/bigr/map1

Conflicts:
	.gitignore