void
Merge branch 'master' of https://github.com/Jiwan/Civilisation

Conflicts:
	Civilization/MainWindow.xaml.cs