small if fix. lab5 is done
Merge branch 'lab5'