Fixed Time Check
Merge remote-tracking branch 'origin/master'

Conflicts:
	TextFiles/MainScript.txt
	phpFiles/CheckTime.php