End of day merge

Finished v2 and pushed live, forms and fonts are done. Still need to
work on blog structure and more font work