ignore
jvjvj
Merge remote-tracking branch 'origin/master'

Conflicts:
	logFile.txt