logic layer finished
Merge pull request #73 from jrec15/master

logic layer finished