good
something is going here
Merge branch 'master' of https://github.com/liugang19890719/windows7
438f7d.

Conflicts:
	index.php

Conflicts:
	index.php