Fixed game1 losing most of the changes I made tonight

git is evil sometimes