work on step 4
Merge branch 'master' of https://github.com/charlestill/shamash