Committing bootstrap changes
Working with styles
Bootstrap layout
Merged in master
Merge branch 'master' into bootstrap