ok srry last time
Merge pull request #42 from calblueprint/kevin/general-stuff

ok srry last time