fixing .java
adding a new HTML file

testing
Merge remote-tracking branch 'cloud/master'

Conflicts:
	test.java