updated readme
updated .gitignore
merge