new changes

adding .ignore git and merging changes