update README
updated the bio line in the README
added a link to the wiki
resolving conflict