testing change
Merge branch 'testing' of https://github.com/timknapp/tripping-ninja into testing

Conflicts:
	fruit