added extra parameter for indicating time of day
Refactored complex echo method into two methods
Renamed the echo methods to greet
Fixed conficts