Deleted a few unnecessary NSLogs and fixed the text overlap bug. For reals this time, I think. :x
Merge remote-tracking branch 'origin/master'