ed's edits from earlier today copied to a new branch
linked to the new 'about' page
merge conflicts
Merge pull request #43 from laxrph10/kate2

Kate2