Initial commit
startingbase settings
merging
merging