code cleaned :)
Merge branch 'master' of https://github.com/nadinebo/CPSC304
Code cleaned :)