jghjk
Merge branch 'master' of https://github.com/Hashtag-helpfindgabby/final-game

Conflicts:
	Final_Game/data/anita running.jpg
	Final_Game/data/anita.jpg
	Final_Game/data/caitlin running.jpg
	Final_Game/data/caitlin.jpg