Fixed revisioning
Trying to resolve merge conflict...
Merge branch 'master' of https://github.com/Brc509/Settlers.git