finished for class
Merge pull request #25 from bchiatt/brian

finished for class