merge conflicts
started restyling bootstrap
vertical css spacing
merge conflicts
header