console
Merge branch 'master' of github.com:CSE512-14W/fp-eamullen-tanvir-willrs

Conflicts:
	script/vis.js
aggregate