Fixed the Code Per Second and Money Per Second
Merge remote-tracking branch 'origin/master'