add prog 08092014 java
Merge branch 'master' of https://github.com/iron1894/Java