new vs. old vis
Merge branch 'master' of https://github.com/brycedorn/wikivis

i fixed dem merge confwicts

Conflicts:
	index.html
	src/css/styles.css
	src/js/newold-vis.js