unfinished data display
Merge branch 'master' of https://github.com/nduchonova/VizEEG

Solving problems with messed up repos on two computers.