fixed font types
h and p tags sizes
replaced slideshow with flexslider
adjusted flexslider image size
removed merge conflict code
added slideshow to main page
adjusted padding and margins