implement sessions
fix merge confict in layout, gemfile, gemfile.lock