Added 80% complete lab04
Merge remote-tracking branch 'origin/master'