Merge request for level 3

Storyboard, code, and tests for level 3. Also updated names of files from Level1 to Level2 when necessary (in tests).