Git is weird.
Merge branch 'master' of https://github.com/MrHangover/DoominionsOfAaldor

Conflicts:
	DoominionsOfAaldor.userprefs