upgraded to bootstrap 3.0.1
Merge branch 'master' of https://github.com/nahankid/inkling