Merge branch 'develop' into feat/dashboard-photo-comments
Merge remote-tracking branch 'origin/develop' into feat/dashboard-photo-comments
[WIP] associate photo and commented_user
Associate user with comment, and write tests
Create comment feature on dashboard
Merge pull request #65 from Tacahilo/feat/dashboard-photo-comments

Feat/dashboard photo comments
Merge remote-tracking branch 'origin/develop' into develop
Merge remote-tracking branch 'origin/feat/dashbord_design' into develop

Conflicts:
	app/views/users/show.html.erb
Merge branch 'develop' into feat/dashboard-photo-comments
Removed unnecessary line
Merge branch 'feat/dashboard-photo-comments' into feat/dashboard
Merge pull request #68 from Tacahilo/feat/dashboard-photo-comments

Removed unnecessary line
画像アップロード機能を追加
Merge pull request #70 from Tacahilo/feat/photo_upload

画像アップロード機能を追加
Change form_tag to form_for
ヘッダーを少しいじったが、変更は特に無し
Merge branch 'develop' of https://github.com/Tacahilo/drop_the_latte into develop
Merge branch 'develop' into feat/dashbord_design
Merge branch 'develop' of https://github.com/Tacahilo/drop_the_latte into develop
Merge branch 'develop' into feat/dashboard