some strat...
Merge branch 'master' of https://github.com/astralien3000/SMA
try to find a strat...
Conflicts:
	Quickstart2010/Quickstart2010/World/Dwarf.cs