logic.java
Merge pull request #60 from jrec15/master

logic.java