started work on css
started work on css
fixed gemfile merge conflict