Added returnChar()
Added mytest to build
Fixed return value in main()
Added deliberate conflict
Resolved merge conflict