changed a line
Merged Kelsey's work
Merge remote-tracking branch 'origin/master'
Merge with github
Merge remote-tracking branch 'origin/master'

Conflicts:
	VolunteerTrack/src/main/java/stonehill/edu/VolunteerTrack/Kelseytest.java
Merge again