字句解析と単純なコマンド実行
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore