Made greeting rude
Merge branch 'master' of https://github.com/Likhi/newGitTest

Conflicts:
	intro.py