some changes
Merge branch 'master' of https://github.com/mattk25/seis635_project into ermias_branch

Conflicts:
	University/src/META-INF/persistence.xml
	University/src/com/seis635/project/model/Class.java
	University/src/com/seis635/project/model/Department.java
updated
Merge branch 'master' of https://github.com/mattk25/seis635_project into ermias_branch
recommendedtext stuff
good changes
almost done
Final commit