Merge pull request #10 from krswanson/development

Added settlement placement
Cards and more