Added my name
Added my name
Merge remote-tracking branch 'upstream/master' into develop

Conflicts:
	README.md
Merge remote-tracking branch 'upstream/master'