making gitignore working again
Merge branch 'master' of github.com:wikirosterTeam/newCrayon