update readme
Merge branch 'master' of https://github.com/sam4ku/temp

Conflicts:
	README.md
new commit on readme