style.css is not used
Upgrade to bootstrap 3
Move css to new location to avoid stale cache
Fix navbar and images
Tweaks
Merge branch 'master' into bootstrap-3
Merging bootstrap3
Merge branch 'master' into bootstrap-3