阿斯蒂芬
Merge branch 'master' of github.com:WeiMing2014/news

Conflicts:
	logout.php