updated gitignore and settlers
fixed merge issues
added a gitignore to Settlers
catching up to nick
Merge branch 'master' of https://github.com/xdryl/settlers