clean
Merge branch 'master' of github.com:moechofe/noname

Conflicts:
	statics/app/calc.js
	statics/app/debug.js
server: add one