updating .gitignore
Merge branch 'master' of github.com:marcatatem/Ottoman