Lab2
Merge pull request #48 from evanwilson/master

Reporting; Evan, Chris, Pete