d
okay
Merge branch 'master' of https://github.com/dev-edo/dev-edo.github.io

Conflicts:
	index.html