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
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
reindent
Merge pull request #93 from Tacahilo/develop

Ready for release