holykss modified p/python.py
Merge branch 'holykss' of https://github.com/bicore/getting_git_1st

Conflicts:
	p/python.py