save
Merge pull request #1 from TomasRan/master

smile.jade
Merge branch 'master' of github.com:limijiaoyin/smile

Conflicts:
	public/js/lottery.js
	public/js/smile.js
	public/js/upload.js
save
save
save
save
save
save
save
save
save
save
save
save
save
save
refine welcome
save
save