Added new world. Updated gitignore
Merge branch 'master' into CATEC_tracking_scenario

Conflicts:
	.gitignore