work on bridges and tunnels
work on bridges and tunnels
trains and pedestrians
Merge branch 'master' of github.com:dschwen/wikiminiatlas

Conflicts:
	wma2/wikiminatlas/project.mml
	wma2/wikiminatlas/style.mss