png to jpg
Merge branch 'master' of https://github.com/xurichard/xurichard.github.io

Conflicts:
	index.html

i