updated gitignore
updated readme with more featuresga .
fixed conflicts