Merge branch 'master' of https://github.com/Shantaviae/YouAreHere

Conflicts:
	explore.html
Merge branch 'master' of https://github.com/Shantaviae/YouAreHere

Conflicts:
	explore.html