added another_file.txt
added some helloworld files
Merge remote-tracking branch 'origin/JA' into JA
Merge branch 'JA' of github.com:tikipatel/day2test into JA
i made changes to file 1
Msfderge branch 'JA' of github.com:tikipatel/day2test into JA

Conflicts:
	file1.txt