23
Merge branch 'master' of https://github.com/Wang691109/Private

Conflicts:
	mysite/index.html
12/26 home