li is not good!
Merge branch 'master' of https://github.com/brian-wzw/oMo

Conflicts:
	mynotes.txt