fix merge conflicts in config.ru
refactor to different controllers for sessions users peeps and website