clear
Merge branch 'master' of https://github.com/melonHuang/novaUI

Conflicts:
	README.md