完成路由的修改，准备开始简化测试代码
Merge branches 'filling-in-layout' and 'filling-in-layout' of github.com:lvyunyi/tutorial-ror into filling-in-layout

Conflicts:
	app/views/layouts/_footer.html.erb
	app/views/layouts/_header.html.erb
修改gitignore，把database.yml加入
Merge branch 'filling-in-layout' of github.com:lvyunyi/tutorial-ror into filling-in-layout