jamesga1/group3 — pull request #3 by mcl0720 (2013-06-25 21:47:32+00:00)
Title: Test merge

This should merge both our latest stuff.