updated .gitignore
start merging
start merging 2