changed HelloWorld.java
chagned
added hello.txt and removed helloworld.java
Merge branch 'master' of https://github.com/mahtabgodara/project1

Conflicts:
	HelloWorld.java
changed the new_file.txt