merge game state
merge person.cs
Merge branch 'master' of https://github.com/juliaducey/Heat-Wave
new maingamestate, celsius