Merge branch 'master' of https://github.com/l1f7/l1f7.github.io

Conflicts:
	about.html
Fixed about.html conflict