added brandon to list of people
Put my name in alphabetical order
Fixed a merge conflict