Exercise 2
exercise 2 pull. Left main01 with merge conflicts
solve merge conflict main01.cpp by keeping my version
changed main02.cpp to main01.cpp