prep for merge
prep for merge again
fixed merge conflicts
changed output format to .csv, added rCharts
Merge pull request #6 from rcquan/dev

Changed output format to .csv, added rCharts