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

Conflicts:
	app/assets/stylesheets/users.css.scss