grunt
Merge branch 'master' of github.com:jixiangac/lili

Conflicts:
	public/js/index.js