Adding conflict file
Adding German flavor
Adding French flavor
Surely this compromise will satisfy all
Renaming conflict file
Adding Greeter class
Added main program body to use greeter class.
Merge branch 'staging'