forgot to commit for a while :/
done some stuff
Merge branch 'static-pages'