incorporate new front view
reworking of public facing marketing pages
continued front-end work
add images and continued front-end work
merge conflicts