sort scan
merge
Merge branch 'master' of https://github.com/irruputuncu/HyriseVisualizer

Conflicts:
	Visualizer/app/views/data/index.html.erb