Add this content
resolve merge conflict
Merge branch 'TerabyteTyler-Ancient-Egypt' into Ancient-Egypt
Merge pull request #54 from TerabyteTyler/Ancient-Egypt

Add this content
Merge branch 'Ancient-Egypt' of https://github.com/kmcurry/3Scape into Ancient-Egypt
Sliding sidebar animation complete