Added sound effects to game.
Cleaned up merge bugs
Cleaned up merge bugs