group image
Merge branch 'master' into dev_ed
fixed conflicts, spammy coverage files
Merge branch 'master' into samsam
just images
css files
Merge branch 'master' into pranava
some styles
Merge pull request #64 from ltfschoen/4apr_plan_c

4apr plan c
migration
user profile styles
Edited production configuraion
fixed class shot background on home page
merge conflicts
Merge branch 'master' into dev_ed
Deleted migration related to user_skils
fixed conflicts
Merge pull request #66 from MollyMoile/marcus

fixed class shot background on home page
Added Rails_factor
Merge pull request #70 from sammyjopeters/samsam

CSS fixes