updated file, README
deleted file, hotfix_whatever
updated README.md file, conflict resolved