add lines
modified
Merge branch 'master' of github.com:gillax/fukuoka

Conflicts:
	hoge
Merge pull request #1 from gillax/develop

Develop