create DisplayH.java
create oam.java
oamj.java
Merge branch 'master' of github.com:maxnus/java

Conflicts:
	DisplayH.java