Add end-of-line config for C# files
Merge branch 'master' into michael_new_menu
Move the SimulationState code into GameplayScreen, and remove the existing GameStates.