いろいろがかわった
Merge branch 'master' into jjjjj

Conflicts:
	app/assets/stylesheets/users.css.scss
Merge pull request #42 from keokent/jjjjj

いろいろがかわった