first and a half commit
readme file
Merge origin/master

Conflicts:
	README.md