Merge pull request #63 from ICTKyouikukei2013/master

conflict fix
fixed tab
Merge pull request #64 from ICTKyouikukei2013/Kosuke/layout

Kosuke/layout