resetting the style css of merge conflicts
Re-adding css
Changed to use local copy
Merge remote-tracking branch 'origin/master' into Production