Revert "test"

This reverts commit 8c8541ffbeb82c0c415943ed40042600910b1868.
Merge remote-tracking branch 'origin/master'

Conflicts:
	trunk/New Text Document.txt