first commit
Merge branch 'master' of github.com:Hysas/assignment2_stefanmg