Added returnChar()
Added deliberate conflict
Resolved merge conflict
Added ggm.c to build
Added yourtest.c to build