Merge branch 'master' of https://github.com/shuopensourcecommunity/home_website.git

Conflicts:
	css/style.css
	ext/latesttime
	images/back-to-top.png
	images/toTop.gif
	index.php
Merge branch 'master' of https://github.com/deltamaster/home_website

Conflicts:
	.gitignore
	css/style.css
	index.php