gitignore に tmp ディレクトリを追加
create moc.
create moc.
Merge branch 'feature/create_moc' into develop
edit Artist/index.tpl
create moc
create moc
create moc
create moc
Merge branch 'feature/create_moc' into develop
create moc
Merge branch 'release/0.0.1'

Conflicts:
	.gitignore