Added flocking example
Fixed conflicts