first buggy working version
Merge branch 'master' of github.com:nullbox/Data-and-Information-Visualization-Project