merging
Merge branch 'master' of git@github.com:mparsha1/CS496TeamProject.git

Conflicts:
	CS496CollegePlannerPersistence/src/edu/ycp/cs/cs496/collegeplanner/model/persist/DerbyDatabase.java