logic ok
logic
Merge branch 'master' of https://github.com/ethornbury/firstJava