update
Merge branch 'master' of github.com:icejoywoo/simpleweb

Conflicts:
	src/static/angularjs.html
	src/static/js/angular.min.js
	src/static/js/main.js