change x -> y
change name calc -> calculate
Merge branch 'feature1'

Conflicts:
	foo.py