header/footer progress
merge fix.
whatever
Merge pull request #3 from katiekatieb/katie

header/footer progress