fixed .gitignore conflict
Merge branch 'master' of github.com:PowerToChange/transition
having trouble with this