asd
Merge branch 'master' of github.com:msturla/bigdatatp1