2nd commit
Merge branch 'master' of https://github.com/tomi10/tomi10.github.io

Conflicts:
	index.html