fixes .gitignore fuck up
Merge branch 'master' of github.com:hirish/trolley