XXX
Merge branch 'master' of github.com:JerryShey/JerryShey.github.io

Conflicts:
	About me.html
	index.html
XXX