bootstrap styles
Merge branch 'master' of https://github.com/testathon/triptofan2.git