added user options file to .gitignore
Merge branch 'master' of github.com:heibelcj/SettlersOfCatanProject