new commit
Merge branch 'master' of github.com:mixasmix/my

Conflicts:
	README