re organized tests but still don't work
Merge branch 'master' of
ssh://git@github.com/mparsha1/CS496TeamProject.git

Conflicts:
	CS496CollegePlanner/src/JUnit/EventTests.java