Carter and Sam: Swagged the hell out of the iPad
Merge remote-tracking branch 'origin/master'