Merge pull request #14 from pstephen43/master

sync up before 2/18 session
Merge pull request #15 from pstephen43/master

sync up
latest code base
latest code base... again
Merge pull request #178 from K-McK/master

sync up