Added charts and graphs module
Added charts and graphs module
Stats feature complete
Fixed up merge conflicts