local add2
Merge branch 'newBranch' of https://github.com/thegi01/pjt into newBranch

Conflicts:
	test2.txt