Updated .gitignore
Merge branch 'master' of github.com:thanley11/scramble