big fux
Merge branch 'master' into eneim

Conflicts:
	app/views/Application/toppage.html
edit toppage.html, add header.html for multiple use.
edit toppage.html, add header.html for multiple use.
edit toppage.html, add header.html for multiple use.
edited home page #1
Merge branch 'eneim'
Merge branch 'master' of https://github.com/eneim/abnomics
fix conflict
Merge branch 'master' of http://www.se.cs.titech.ac.jp/lecture/exp4/git/abeno