Sprint 3
Merge pull request #66 from evanwilson/master

Sprint 3: Evan Wilson, Pete Stivala, Chris Lawrence