Added code to draw dog teams
Fixed merge conflicts