Updated to use ARC
Removed Facebook picture and commented lines
Merge remote-tracking branch 'origin/master'