added data and started voltage stuff
Merge branch 'master' of https://github.com/TheoT/Lab7