Merge branches 'master', 'master' and 'master' of github.com:toddhainsworth/sinatra-template
Merge branches 'master' and 'master' of github.com:toddhainsworth/sinatra-template