ng-controller修正
ng-includeの使用
Merge remote-tracking branch 'origin/master'

Conflicts:
	view/detail.html