updates and almost done
Merge branch 'master' of https://github.com/dgershte/money

Conflicts:
	index.js