Placed robber in CatanMap constructor
Merge branch 'master' of https://github.com/255/catan