Merge pull request #7 from zirbem07/master

added nav bar to newsfeed
commit style changes for form.html
Added icons for newsfeed, included ChartJS
merging maxs navbarMerge branch 'master' of https://github.com/tracyalison11/datavis
Merge pull request #8 from johnyi23/master

commit style changes for form.html
got bar graph working with dummy data
Resolved merge conflicts
commit fixes to form and stats
updated index.html with icon
updated index.html with icon
Update index.html
Update style.css
Create abc
Merge pull request #10 from brendancwood/master

user stats, chartJS and login admin all stable
Merge pull request #9 from zirbem07/master

added functionality to 'remember Me' check box
Merge branch 'master' of httpst://github.com/tracyalison11/datavis

Conflicts:
	index.html
resolved merge conflict
removed empty file abc
added two png files
Merge pull request #11 from zirbem07/master

added phone num and nav bar to admin page