Merge pull request #13 from pstephen43/master

Sync up during 12/4 session
Fixed stuff
Fixed Stuff
Merge pull request #102 from PJTNT11/master

sync up during 12/4 session