added map folder
remoted map folder
new gitignore
Merge branch 'refs/heads/master' into map

Conflicts:
	.gitignore