goals
Merge remote-tracking branch 'origin/master'

Conflicts:
	GraphicsAssignment4/src/Goal.java
	GraphicsAssignment4/src/the_game.java