Added a state class, add stuff accordingly
Merge branch 'master' of https://github.com/Leandia/GUI-programming.git