initial commit
Merge branch 'master' of github.com:g-milligan/newfiles_java