axxaxaxaxa
kk
Merge branch 'master' of https://github.com/intuinno/YelpVis

Conflicts:aa
	3javascript/yelpvis-2space/public/index.html
	3javascript/yelpvis-2space/public/js/UtilitiesLibrary.js
	3javascript/yelpvis-2space/public/js/parallelspaces.js
	3javascript/yelpvis-2space/public/js/visdock.js