ひとまずこけおどし
Merge branch 'master' of github.com:myfinder/ghostintheshell

Conflicts:
	tmpl/.DS_Store