Finish up levels 1 and 2
Merge branch 'level1-2'