added gemfile.lock
fix merge conflicts
fixed seed file and renamed images/logo.png