Professor HW Add and Edit functionality
resolving conflicts

Conflicts:
	src/ncsu/csc/db/controllers/CourseController.java
	src/ncsu/csc/db/controllers/HomeworkController.java