error branch with updated cleaner readme
fixed conflict
updated README