getting organizedO
Merge branch 'static-pages'
Getting organized