bootstrap 2.3.2
Merge branch 'master' of github.com:Apercu/ShitBlock

Conflicts:
	js/options.js