Assignments feature complete
Merge branch 'assignments' into develop