squash test1
jake local squash test
ver 2.0

Conflicts:
	test.txt