added ruby to gemfile
gemfile and some css updates
merge issues