Merged GameState with framework. Re-worked States class. Program demo now runs in State instead of main. Please note that memory leaks and indepth testing has not yet been checked.