Javadoc finished for every java class in states package, must read over it
Merged Gamestate