Added sayHello and added main function
Added help for Josh
I added the work and fixed conflict