initial commit
Merge branch 'master' of https://github.com/annnik/Assignment-2