Merge pull request #11 from pstephen43/master

another sync up before 12/10 session
more data logging
fixed the errors with datalogging
Merge pull request #141 from K-McK/master

fixing an error