goals
Merge remote-tracking branch 'origin/master'

Conflicts:
	GraphicsAssignment4/src/Goal.java
	GraphicsAssignment4/src/the_game.java
oops
Colored goals

harder than it should have been.
Team changes
No idea...cmon github
Merge remote-tracking branch 'origin/MattGame'
merge
switched positions of the ball villain and hero

hero starts at own goal
villain starts at own goal
ball starts in middle
Merge remote-tracking branch 'origin/MattGame'
missing a color
Merge remote-tracking branch 'origin/NickGame' into NickGame

Conflicts:
	GraphicsAssignment4/src/the_game.java
Scoring works
merge