preparing to pull
Merge branch 'master' of https://github.com/fsteen/monopoly-for-the-gods
commiting before i push