Update 07/16
Merge branch 'master' of https://github.com/loisyang/loisyang.github.io

Conflicts:
	index.html