initial commit
Merge branch 'master' of https://github.com/Tony-Saijo/tsj_sinatra