karlstolley/535 — pull request #50 by atsansone (2012-12-05 00:37:00+00:00)
Title: Just making sure everything's together

This would be my last pull request for class. Rebased to master then pushed.