changed read me
Merge branch 'master' of https://github.com/roberttyg/testproject

Conflicts:
	README