修复一些问题

Signed-off-by: Meathill <meathill@gmail.com>
Merge branch 'master' of github.com:meathill/knife

Conflicts:
	css/style.css
	img/left.png
	img/right.png
	index.html
	js/main.js