stock
Merge branch 'master' of https://github.com/bletham/shared_coding

Conflicts:
	testing.py