Added changes discussed in class
Merge pull request #60 from SteveLobdell/master

Added changes discussed in class