added the ability to add settlers to the board
merging stuff