Added getState method, fixed a bug with tests not ending
Merge branch 'master' of github.com:michboon/comp2014