fixed conflicts, spammy coverage files
Merge branch 'master' into samsam
css files
Merge branch 'master' into pranava
user profile styles
Edited production configuraion
fixed class shot background on home page
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
Merge pull request #67 from elitenomad/pranava

Pranava
Merge pull request #68 from elitenomad/master

Deleted migration related to user_skils
Merge pull request #69 from ed-fast/dev_ed

Dev ed
remove conflict text
Merge branch 'master' into dev_ed
fixed bottom section styles