Changed 'hello.py' file
Changed file.
Changes in hello file.
Merge branch 'master' of https://github.com/lmaroun/csa-test

Conflicts:
	hello.py