add twitter boostrap
fix merge conflicts
Merge pull request #6 from kyledaugherty/styling

Styling