Merge branch 'master' of github.com:nervouna/testfry

Conflicts:
	testfry.py
Merge branch 'master' of github.com:nervouna/testfry