trying to fix branch
Merge branch 'UnStable' of https://github.com/rebeccamurphy/HackathonCatwithTwoLegs into UnStable

Conflicts:
	functions.py
	pythontest.py