calculate stats by time period
fixed merge conflicts
oops
Merge branch 'master' of https://github.com/ryanboye/fun-money
fix template
Merge branch 'master' of github.com:ryanboye/fun-money
Fixed syntax errors
added basic data parsing
beginning style changes