Merge pull request #12 from pstephen43/master

Sync up after 12/3 PM session
Fixed Merge errors
SNUFF
Merge pull request #98 from PJTNT11/master

sync up before 12/4 session