closes #11
Merge branch 'config' of github.com:Solid-Interactive/masseuse into config