changed all rand to arc4random_uniform
Merge remote-tracking branch 'origin/master'