changes first line of casual greeting
Merge branch 'master' of https://github.com/arjunvenkat/git_test
adds knock knock to casual greeting
fixes merge conflicts