Working on adding assignment display
Merge branch 'master' of https://github.com/derektom14/HackRice2014

Conflicts:
	HWOrganizer/src/hwo/CreateEditCourse.java
Merge branch 'master' of https://github.com/derektom14/HackRice2014