Changed README on testmerge
Merge remote-tracking branch 'origin/testmerge'

Conflicts:
	README.md		Merged both!