first commit
commit without staging
jksfjfdjemoved new text

Please enter the commit message for your changes. Lines starting
tes added
added file to testing branch
added file to iss53 branch
added hotfix
iss53 altered
Merge branch 'iss53'

Conflicts:
	iss53.txt
commied w/o moving to staging area