added boostrap (for real)
Merge branch 'master' of https://github.com/amcglathery/turnt-cyril