Updates README and CHANGELOG

* Cleans unnecessary directories and files from merge conflict.