first commit with klabunde

Signed-off-by: Zach Klabunde <zbunde@gmail.com>
Merge branch 'master' of https://github.com/stevepm/sinatrapp