readme updated
ignores updated
lib added
merge
merge
merge