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