Update sass to stylus
remove bg
Merge branch 'master' of https://github.com/iSnifer/layout-bootstrap

Conflicts:
	js/libs/jquery-2.0.0.min.js