new work
Merge branch 'master' of github.com:AndSea/learngit

Conflicts:
	readme.txt