New Map!
Merge remote-tracking branch 'origin/master'

Conflicts:
	img/maps/campaign_map.jpg