Fix state change
Merge branch 'citrus' of github.com:miguelSantirso/ludum_dare_29 into citrus