commit test1
Merge branch 'master' of https://github.com/mantos/gitsandbox

Conflicts:
	README.md