adds bootstrap and more notes
adds notes
fixes merge conflict