funct1.py changes
Merge branch 'master' of https://github.com/goehmen/hello-py

Conflicts:
	funct1.py
Merge branch 'master' of https://github.com/goehmen/hello-py
more ch4