Merge pull request #3 from pstephen43/master

Sync up before 11/21 session
maped
Merge pull request #67 from PJTNT11/master

mapping controllers