whoops indeed
ignoring that file now.
Merge branch 'master' of github.com:mrthunderfield/socialfeed