refine code
Merge branch 'master' of https://github.com/Taining/to-do

Conflicts:
	news.php