merging
Merge branch 'master' of https://github.com/fsteen/monopoly-for-the-gods

Conflicts:
	.profiles.mf
FINAL