stuff n such
fixed up
needing to push so jason can do some blog stuff. The layout is messy on some pages, please don't hate me.
resolving conflicts