adding 2 more files : LICENSE.txt input.txt
testing branch commit 1
testing branch commit, edited LICENSE from master
testing branch commit 2, deleting lines in LICENSE
Merge branch 'testing2'

Conflicts:
	LICENSE.txt

successful merge 1