Changes to Unit

Added things to Unit Class.
Changes to Unit

Changed int to longs in Unit arc4random
Merge remote-tracking branch 'origin/master'