random comment fixes
hi
merge conflicts
comments
Merge pull request #61 from calblueprint/tricia

Tricia