Edited readme.md

Fixed some merge issues in the readme.