added two-page-experiment branch
two pages working with new module/manifest system
fixed broken test
formatting tweaks