Added another_one_function()
Merge branch 'testing'

Conflicts:
	script.py