finished all calculations
Merge branch 'master' of https://github.com/rvnijnatten/IP2