oooo;;;;
Merge branch 'master' of github.com:sbtiny/hello

Conflicts:
	README.md
oloosol
Merge branch 'master' of github.com:sbtiny/hello

Conflicts:
	hha.c