tinkering
finished static pages
Merging conflicts