In process of adding a front end
try to merge
Merge pull request #15 from cougarTech2228/working

pointless merge
Merge pull request #16 from cougarTech2228/working

minor restructureing of joy module, now makes significantly more sense
Fixed Issue #17
Trying to merge
uncommited files
Merge branch 'master' into working
Changes for compatability across branches