Merge pull request #52 from COSI236TA/integrate

Integrate
Made charts wider, changed class for fancybox to fancybox.ajax