greet() -> dogreet()
Merge master and resolve conflicts
Merge pull request #3 from jknotten/topic

greet() -> dogreet()