Wout: Made a class for myself to test in
Merge branch 'master' of https://github.com/frostraver/IP2