stash?
Merge branch 'master' of https://github.com/polyf/corpstatesc

Conflicts:
	game/CorpStatesC.layout
works but will freeze for long periods