Merge pull request #1 from ziggyzaggy/master

proposed layout with bootstrap