git ignore added
merge
cleamup;