First commit
Added README file
Merge master/master

Conflicts:
	README.md