update some information
Merge branch 'master' of https://github.com/zzalabri/INN374-Assignment2