added display none to 'marin' and 'thebay'
Merge branch 'master' of https://github.com/BustinBash/BustinBash
Merge branch 'master' of https://github.com/BustinBash/BustinBash
game ends at 20 lessons
Merge pull request #54 from BustinBash/lesson-loop

Lesson loop
Resolve the merge conflicts with app.css and application.css