minor waypoints improvements
changed Display to use a Map instead of an Array
Merge remote-tracking branch 'upstream/master' into minors
Allow optionally passing a color to the flock renderer
improved RGB
Merge pull request #27 from fponticelli/color-fixes

improved RGB
Merge pull request #24 from fponticelli/minors

Minors
Merge branch 'colored-boids' of github.com:mlms13/boidz

Conflicts:
	bin/canvas.js
Use a string for color so it compiles
fixes for haxe 3.2
minor cleanup
individual boid waypoints
Merge branch 'color-fixes'

Conflicts:
	bin/canvas.js
	demo/Canvas.hx
	src/boidz/Boid.hx
	src/boidz/rules/AvoidCollisions.hx
	src/boidz/rules/SteerTowardGoal.hx