emptied the file
Checked out master
master changes
Merge branch 'test' of github.com:melj/BigWhiteBox into test
Merge branch 'master' into test

Conflicts:
	Test.txt