test 3 2
Merge branch 'v3' of https://github.com/legrcharles/DragAndDrop.git into
v3

Conflicts:
	test.txt