Resolved conflicts for PR #10, ported rCharts plotting library

Resolved conflicts for PR #10.  The ShinyApp is now working as intended.