added some stuff to gitignore to try and fix our merging conflicts with binary files