Adjusted README
expecting merge conflict
merged
Added master
Merge remote-tracking branch 'origin/master'

Conflicts:
	README.md
Pimped README.md