added bootstrap 3
fixed merge issue in head