Semi final map update
Merge remote-tracking branch 'origin/master'

Conflicts:
	Website/maps2.html