Merge pull request #16 from pstephen43/master

Sync up before 12/5 session
Fixed Merge errers
Merge pull request #106 from PJTNT11/master

Fixed compile issues due to merge