Add initial page with twitter bootstrap
Publish my first page
fix conflicts