change-the-basic-layout-to-match-twitterboostrap
Merge branch 'front-end-basic-mockup'