update

lipo -info
Merge branch 'master' of https://github.com/MerenguesGeek/MerenguesGeek.github.io

Conflicts:
	index.html