touch my body baby
Please do it
Merge pull request #2 from hanskent/master

Hello all. This is my file!!
Merge pull request #1 from nrwilson4d/master

touch my body baby
adding to story
Merge pull request #3 from rhotonk/master

adding to story
this is my second attempt
adding git helper
Merge pull request #4 from rhotonk/master

adding git helper
Cleaning out the repo
adding to story
making changed to git helper
Merge pull request #5 from rhotonk/master

Cleaning out the repo
fixed problem with git help
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!!