Added the factory pattern into our project
Added Game Factory
Factory method for balloon
Score file modified
Merge branch 'feature/getset' of github.com:mbelsare/CMPE202 into feature/getset

Conflicts:
	Project/Balloon.ctxt
	Project/Boy.ctxt
	Project/GameWorld.java
	Project/Score.ctxt
	Project/Score.java
	Project/project.greenfoot
Merge branch 'feature/balloonfactory' of github.com:mbelsare/CMPE202 into feature/balloonfactory

Conflicts:
	Project/.DS_Store
	Project/Balloon.ctxt
	Project/Balloon.java
	Project/GamePlay.java
	Project/GameWorld.ctxt
	Project/GameWorld.java
	Project/Score.ctxt
	Project/Score.java
	Project/project.greenfoot
Code merging issues resolved 11/22 5:25 PM
Error changes (redballoon)
Red balloon
Merge branch 'feature/getset' into feature/design

Conflicts:
	Project/Balloon.java
	Project/Boy.ctxt
	Project/GameWorld.ctxt
	Project/Score.ctxt
	Project/Score.java
	Project/project.greenfoot