Fix gitignore
Merge branch 'master' of github.com:codykraz/Catan