w didnt want this commit
Revert "w didnt want this commit"

This reverts commit f3753e5a4e181255db350dc19f0b78cee7dbcce5.
Add an author/email comment
Revert "Add an author/email comment"

This reverts commit aa5a06c5bda13612bd43c5ab6a48b62b454d5331.
in branch greet
this is in master
merged master fixed conflict