Merge pull request #1 from matrix-msu/master

Master
Gebelein/Naga el-Gherira Location
Add pins
Merge branch 'fridayco-master'