First commit
Merge https://github.com/william57m/log121lab4