css changes
no message
Merge branch 'master' of https://github.com/risinglf/startupbox-website

Conflicts:
	config/mongoid.yml
	tmp/cache/assets/D0E/F80/sprockets%2F8c2b061e379a23e7c4d207adcf992462
	tmp/cache/assets/D2D/D50/sprockets%2Fd585a06e2ee6203ccb04c8b84150d14d