Merged README
Fixed a small bug
Fixed tiny merge conflict