Merge pull request #1 from Cloud-G/master

adding an new Java file
Update test.java.txt
Rename test.java.txt to test.java
update java file from local machine
add 'Vboxlocal' folder
Merge remote-tracking branch 'cloud/master'

Conflicts:
	test.java