Submitted Lab 1 > helloworld.c
Git add resolving merge conflict
Testing class setup
Resolving merge conflict