resolving merge conflicts.

app.py

@@ -30,10 +30,9 @@ demo = gr.Interface(
     fn=generateVideo,
     inputs=[gr.Image(shape=(256, 256)), gr.Audio(), ],
     outputs= gr.Video().style(height=256, width=256), 
-    title='Audio Driven Animation',
-    description='This is my app',
-    examples =[['example_image.jpg', 'marlene_example.wav']]
-
+    title='Audio Driven Animation', 
+    description='Add an image and an audio file then watch them come to life! Please note, at the moment images must be 254X254 and audio files must be .wav format. Enjoy!',
+    examples =[['example_image.jpg', 'example_audio.wav']]
         
 )