fixing git .ignore to ignore bin & gen directories
resolved merge