Added sounds to the game
Pulled and fixed a conflict