Merge branch 'master' of https://github.com/BlueRubberDucky/project7

Conflicts:
	Model.java
	Volunteer.java
test
Merge branch 'master' of https://github.com/BlueRubberDucky/project7

Conflicts:
	Model.java
	Volunteer.java