minor upd
merge
added .gitignore