Update Readme

Testing conflicts
Resolved Readme conflict

Just a test
Merge pull request #24 from berendbaas/develop

Test: Resolving conflicts.