update twbs classes for v3
fix merge conflicts
Merge pull request #8 from kyledaugherty/styling

Styling