updated some css
updated css -- needs to be refactored
Merge branch 'bastard' of github.com:stephaniecoleman/AngelHub into bastard
fixed merge conflict