Added icons for newsfeed, included ChartJS
merging maxs navbarMerge branch 'master' of https://github.com/tracyalison11/datavis
got bar graph working with dummy data
Resolved merge conflicts
commit fixes to form and stats
Merge pull request #10 from brendancwood/master

user stats, chartJS and login admin all stable