g2 done
Merge branch 'IdealBarrier' of https://github.com/jakobkolb/Master-Thesis into IdealBarrier