bootstrap changes
author changes
merged-rebased
add files
erged
gemfile
small changes