Sprint1
Merge pull request #46 from evanwilson/master

Sprint1 (Evan, Chris, Pete; Reporting)