almost there
moved bootstrap to component
Merge branch 'master' of base_setup

Conflicts:
	.gitignore