OSD600 Lab 3: Git merges and parallel branches + Some 0.2 updates

This week we went through the process of merging different branches and generally working in parallel...