123
Merge branch 'master' of http://github.com/lixingji/ViewSS

Conflicts:
	README.md