calc
Merge branch 'master' of https://github.com/blackandcold/Phy_ws2013_praktikum
part 1 started