update
Create hello.txt
Merge branch 'master' of https://github.com/fdhay/java-hiking.git

Conflicts:
	WholeProject/README.md
	WholeProject/hello.txt