Css changes
Merge branch 'master' of https://github.com/risentteam/online_system

Conflicts:
	app/assets/stylesheets/custom.css.scss
	app/views/static_pages/home.html.erb