Added bootstrap changed nav colors
added images. changed header
fixed merge conflicts