divided up UML to make it readable
Merge branch 'master' of github.com:MarsEdge/OUCS2334
sync changes
added missing labs, added final project 4, started project 5
Merge branch 'master' of github.com:MarsEdge/OUCS2334

Conflicts:
	Project4/src/ScholarPubController.java
Merge branch 'master' of github.com:MarsEdge/OUCS2334

Conflicts:
	Project4/src/ScholarPubController.java
	Project4/src/SelectionView.java
fix compile errors
fix saving exception