second commit
Merge branch 'master' of github.com:ogaoga63/test1

Conflicts:
	readme
forth commit
Merge branch 'master' of github.com:ogaoga63/test1

Conflicts:
	readme