Merge remote-tracking branch 'origin/develop' into develop
Merge pull request #30 from Tacahilo/feat/index_design

スマホ対応して、ヘッダーを作りました。
Add update and delete user
Merge remote-tracking branch 'origin/develop' into develop
Merge branch 'feat/update_and_delete_user' into develop
And rewrite tests

Conflicts:
	app/views/layouts/_header.html.erb
Add faker gem
Merge pull request #32 from Tacahilo/feat/fake_user

Add faker gem
Merge branch 'develop' of https://github.com/Tacahilo/drop_the_latte into develop
Add user destroy action
Merge pull request #34 from Tacahilo/feat/destroy_user

Feat/destroy user
Merge remote-tracking branch 'origin/develop' into develop
Refactor users edit and new page with partial.
Merge pull request #40 from Tacahilo/feat/partial_users_page

Feat/partial users page
Merge branch 'develop' of https://github.com/Tacahilo/drop_the_latte into develop
フォーム周りのデザインを追加
フォーム周りを微調整
Merge branch 'develop' of https://github.com/Tacahilo/drop_the_latte into develop
コンフリクト修正