edit by Sierra
Merge branch 'master' of https://github.com/angusforbes/test_ISTA

Conflicts:
	readme.txt