Added git ignore 

to avoid having to merge everytime project is open