update
Merge branch 'master' of https://github.com/LectomT/lectomt.github.com

Conflicts:
	self/index.html