Replace & with &amp; to make makuku happy
Merge pull request #16 from rhyolight/site-reorg

Replace & with &amp; to make makuku happy