added name
Merge branch 'master' into rebecca

Conflicts:
	README.md
Merge branch 'rebecca'