首页和历史记录
Merge branch 'master' of https://github.com/guzeng/one

Conflicts:
	app/views/home/history.php
	assets/css/home.css