Added Max Prendergast
Added my name to names.txt
Resolved conflict in names.txt