Modify gitignore and upload the speaker code to final_project_part_C.c
Fix merge conflicts between speaker code and information bar code