Updated many of the hard logics
Merge branch 'master' of https://github.com/dgershte/money