rename greet() -> sayhello()
Merge master and resolve conflicts