Merge pull request #63 from matrix-msu/master

Add student popups to site
Merge pull request #64 from matrix-msu/master

Add all commits to gh-pages
Merge pull request #66 from matrix-msu/master

Changes from Brafford
Merge pull request #68 from matrix-msu/master

Heraclepolis Pin fix spelling
Merge pull request #70 from matrix-msu/master

Kom Ombo Pin Added Intro
Merge pull request #72 from matrix-msu/master

Kom Ombo Pin change introduction
Update aa-sites-popup.csv
Merge pull request #73 from fridayco/master

Update Gebelein/Naga el-Gherira Popup
Merge pull request #74 from matrix-msu/master

Add Gebelein/Naga el-Gherira Popup
alter Naucratis popup
Update Popup Intro and create page
Merge pull request #77 from MDaugherty83/master

Update Popup Intro and create page
Merge pull request #78 from matrix-msu/master

Add Naucratis page
Added Naucratis Page
Changed an image
Merge pull request #79 from MDaugherty83/master

Added Naucratis Page
Update Popup autoPanPadding to account for NavBar
Merge pull request #80 from matrix-msu/master

Update Panning and one page
added Kerma
add Mut el kharab