Assignment 2
Merge branch 'master' of https://github.com/suicausa/Diana---IT100