update templates and add tinymce
fix conflicts - Leave No Commit Behind
remove commented out elements
update with new upper nav - not finished
updated horizontal nav
removed background color Cannot decide
configured horizontial menu fonts and media queries