remove files from previous merge resolution
add period (quarter, half, etc) info to stats
Merge branch 'master' of github.com:emilyreinhold/StatThat into record_stat
adding a dummy recent stat works