Added static pages
Finished Static Page
Finished Static Page
Fixing conflicts
Fixing more conflicts
Fixing more conflicts