fixed conflicts, spammy coverage files
Merge branch 'master' into samsam
user profile styles
fixed conflicts
Merge pull request #70 from sammyjopeters/samsam

CSS fixes