Wave merge

First two lessons of Module 3 merging into master