article 2: first two questions answered
Merge branch 'master' of https://github.com/TISYE-GroupC/SPIT
article 2: first two questions answered