1--添加诗句页面
Merge branch 'master' of https://github.com/wkupaochuan/toy

Conflicts:
	index.php