changed .gitignore to *.img, *.bin
resolved conflict