mean
Merge branch 'master' of https://github.com/jingyanw/phase-retrieval

Conflicts:
	update.m