finished group work
Merge pull request #2 from bchiatt/dev

finished group work