Merge pull request #14 from bmneely/Bootstrap

Fix bootstrap
Merge pull request #13 from tiyang/Bootstrap

layout problem
Merge branch 'master' of https://github.com/tiyang/blocmarks into Bootstrap