added css stuffs
Merge branch 'bootstrap'