a joke
Merge branch 'master' of https://github.com/0704681032/Java8InAction

Conflicts:
	webapp/js5简单算法.html