引入新的樣式
Merge branch 'cjw-new' into dev

Conflicts:
	app/assets/stylesheets/application/main.css.scss