bad merge cleanup 1
modified readme
added gitignore file