up
Merge branch 'master' of https://github.com/1di0t/1di0t.github.io

Conflicts:
	index.html