Market and updated GameManager
Merge branch 'master' of https://github.com/Jobs92/Avalon