update gemfile lock
updated a shitload of css
update gemfile lock
fixed merge with css