Merge pull request #1 from kinghenry8/master

Client asking for changes beyond scope of assignment, saving state here
Merge pull request #2 from kinghenry8/IS322

second merge