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

Conflicts:
	CS496CollegePlannerPersistence/derby.log
	CS496CollegePlannerWebService/derby.log