Write up text for simple testing exercise in lab 2
Merge master