Added music, more sound effects, scoring, and UI
Fixing merge conflict