fixed readme and added a gitignore
merge