fixed time update
Merge branch 'master' of https://github.com/lrmymycn/GDayApi
conflict fixed
Merge branch 'master' of https://github.com/lrmymycn/GDayApi

Conflicts:
	public_html/train.php