first attempt
Merge branch 'master' of https://github.com/cwinter97/lab8-6