update 1/13
Merge branch 'master' of https://github.com/Hashtag-helpfindgabby/final-game into HEAD