Things and such
Merge branch 'master' of github.com:chuck211991/CSCI_6140
Fixed idle