fixed conflict in custom.css
Merge branch 'umass_branch' into staging