Update the README
Fix conflicts
Add a link to the wiki in the README
Merge pull request #48 from projectcs13/develop

Develop