assignments views
resolved conflicts in assignments_controller