Merge pull request #10 from pstephen43/master

sync up before 12/3 AM session
MORE STUFF
Merge pull request #94 from PJTNT11/master

cleaning up the merge