Changes
Conflicts:

about.html
index.html
lyszie.css
Merge branch 'master' of https://github.com/Lyszie/Lyszie.github.io

Conflicts:
	about.html
go