Hello all. This is my new file!!
touch my body baby
Please do it
adding to story
hello
Merge pull request #5 from rhotonk/master

Cleaning out the repo
Merge pull request #6 from rhotonk/master

fixed problem with git help
Merge branch 'master' of https://github.com/hanskent/javaApp-1

Conflicts:
	kentsfile.txt
	story.txt
Hello World!!
Merge branch 'hanskent-master'

It is needed