Update README

Tried markupstuff
Rename README to README.md
Update README.md
Update README.md
Update README.md
Update README.md
Update README.md
Merge branch 'master' into dev

Conflicts:
	README.md
Merge remote-tracking branch 'origin/dev' into dev