微修正
Merge branch 'master' of
http://www.se.cs.titech.ac.jp/lecture/exp4/git/abeno.git

Conflicts:
	app/views/Application/index.html
	app/views/Application/toppage.html
toppage➡home
fixed header
Merge branch 'master' of http://www.se.cs.titech.ac.jp/lecture/exp4/git/abeno