just getting everything into git
Merge branch 'master' of https://github.com/csherland/hertz