added Wiki thing in README.md
Merge pull request #1 from wesleymccloy/readme-edit

added Wiki thing in README.md
Delete test-file
Merge remote-tracking branch 'origin/master' into newbranch

Conflicts:
	README.md