took out bryans changes
Merge branch 'master' of https://github.com/walterlatimer/goodmeasure