first commit
Merge https://github.com/kiel3/4414_homework1
Merge branch 'master' of https://github.com/kiel3/4414_homework1