fixed merge conflicts and added bootstrap
fixed merge conflicts and added bootstrap
fixed merge conflicts