Merge with github
Merge remote-tracking branch 'origin/master'

Conflicts:
	VolunteerTrack/src/main/java/stonehill/edu/VolunteerTrack/Kelseytest.java
Merge again
Oops... extra comment
Merged with github
Merge remote-tracking branch 'origin/master'