error
Merge branch 'gh-pages' of https://github.com/kevinabraham/bootstrapexamples into gh-pages

Conflicts:
	defaultnavbar.html