merge
attempting to merge with a few html partials, new partial folder structure