first commit
fixed merge
Merge branch 'master' of https://github.com/cwinter97/lab7.9
added a file