just need to pull
Merge origin/master

Conflicts:
	log.txt
Merge origin/master
Final Checking