change of score
Merge branch 'master' of https://github.com/SJSU-CMPE202-Group12/X-Fighter

Conflicts:
	Refactor/X_Fighter/EnemyGenerator.pde
	Refactor/X_Fighter/PlayState.pde