I have wonderful time
Demo 5 - Master
Merge branch 'QuickDemo'

Conflicts:
	DemoFile.txt
Commit Demo6 to Master