updates
Merge branch 'master' of https://github.com/1lann/1lann.github.io

Conflicts:
	egypt/index.html