re-init local repo on win
Merge branch 'master' of https://github.com/DavidPhilip/bootstrap

Conflicts:
	docs-assets/js/holder.js
	fonts/glyphicons-halflings-regular.eot
	fonts/glyphicons-halflings-regular.svg
	fonts/glyphicons-halflings-regular.ttf
	fonts/glyphicons-halflings-regular.woff