Changed readme
Merge branch 'master' of https://github.com/lbl-srg/sandbox

Conflicts:
	README.md