Added winstate
Revert "Added winstate"

This reverts commit 90bf90e3f25ded07d6686b6373c9212d7aecfb40.
Minor fix
Merge branch 'develop' of https://github.com/Godofdrakes/AIE_Frogger into develop

Conflicts:
	source/GameState.cpp
Update
Update
Update
Added winstate
Added setting state (unfinished)
Updated draw and exit from settingsstate
Merge branch 'develop'