adds create action to the greetings controller
merges conflicts