added lab4
Unclear merging annoyance
Tentative push to preserve current merge state.