jessica changes
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	A.txt
	B.txt
	C.txt