I am committing because this is so much fun!
This is my second try committing
Merge branch 'master' of https://github.com/drbobdugan/Capstone2014.git

Conflicts:
	VolunteerTrack/target/m2e-wtp/web-resources/META-INF/maven/stonehill.edu/VolunteerTrack/pom.properties