f
Merge remote-tracking branch 'origin/master'

Conflicts:
	testing.py
Merge branch 'master' of https://github.com/craigprice/XTSM_1

Conflicts:
	testing.py