Fix link to bootstrap's css
Merge branch 'step-05-inheritance' into step-06-models