Update to Last
Merge branch 'master' of https://github.com/bootstrap3/bootstrap3.github.io

Conflicts:
	docs.html