Changed the readme around.
Fix merge conflict.