自己参照
Merge branch 'one' of https://github.com/tatsumihiroki/clubgalre into one

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