<updating AFNetworking on Thomas' computer
adding project file
fixed merge conflicts