Merge pull request #9 from pstephen43/master

Sync up before 12/2 session
added a new macro  and fixed some issues
added so more macros
renamed something
changed more small stuff
More small fixes
more...
stuff
more
Merge pull request #92 from PJTNT11/master

Sync up after 12/2 session