Format CodeRay
Merge branch 'master' of https://github.com/susieye19/learnrails into susieye19-master

Conflicts:
	app/assets/stylesheets/chapters.css.scss
	app/assets/stylesheets/custom.css.scss