my changes
Merge branch 'master' of https://github.com/nloreti/infovis-final