test
Merge branch 'master' of https://github.com/kuba-bootstrap/bootstrap

Conflicts:
	index.js
setup separate test