update css custom.css
Merge branch 'master' of https://github.com/tuyetle/Q-A-Platform

Conflicts:
	app/styles/custom.css