updated
Merge branch 'master' of https://github.com/shuyangli/CSE-20211-Final-Project

Conflicts:
	drawCharacters.c