added some content
adjusted gemfile
fixed merge conflicts