Small changes
Merge branch 'gh-pages' of https://github.com/CSE512-14W/a3-depstein-domoritz into gh-pages

Conflicts:
	scripts/chart.js
commenting out axis