all
y

Merge branch 'master' of https://github.com/thengugi/thengugi.github.io

Conflicts:
	index.html