merging Jacobsbranch (twitter bootstrap)