added money coming in and going out
Merge branch 'working'