updated associations and validations
merged conflict in session controller
changed variable names based on new migrations