full merge with master

.gitignore

Makefile

README.md

main.cpp

makeTestBehaviours.mk

makeTestFearful.mk

makeTestGregarious.mk

makeTestKamikaze.mk

makeTestMultipleBehaviours.mk

makeTestPetFactory.mk

src/Animal.cpp

src/Animal.h

src/AnimalFactory.h

src/Aquarium.cpp

src/Aquarium.h

src/BehaviourStrategy.h

src/Environment.cpp

src/Environment.h

src/Eyes.cpp

src/Eyes.h