added tests for volunteer
- still need to add merge() test
Merge branch 'master' of https://www.github.com/iainworkman/370Project