big on vacation offline commit
back from vacation
Merge branch 'master' of https://github.com/nebocamin/tsosi-story