add new color strategy
Merge branch 'new' of github.com:mateusbraga/watermelon-4444-group9

Conflicts:
	src/watermelon/group9/Player.java