asd
Merge branch 'master' of github.com:bubbleking2/New-folder

Conflicts:
	F1.txt