aa

Conflicts:
	3javascript/yelpvis-2space/public/js/parallelspaces.js
aa
Merge branch 'master' of https://github.com/intuinno/YelpVis

Conflicts:
	3javascript/yelpvis-2space/public/js/visdock.js
bb