2.2.0

MPHSlaats

@mphslaats

8ed0e819 · Merge branch 'develop' into 'master' · Oct 24, 2018

Implemented the new state diagram after some feedback