someone deleted the bin/.gitignore file ... don't know if this was
purposeful but i added it back in ... if you have merge conflicts that
you can't resolve, it's probably because you need to add this file back