put in bootstrap
style bootstrap
Merge branch 'master' into frontend-makeover

Conflicts:
	static/css/boot/mixins.styl
	static/css/my-style.styl
	static/css/old.styl
	static/index.html
	static/js/app.js