Updated list of Organizers and Nominees. Resolved merge conflicts from master.

Conflicts:
	nominees.md
	organizers.md