bootstrap and aesthetics
merge con-fixed with master
play with shapeshift (not working)
Merge pull request #13 from eewang/css

Css