Bunnys Born
Merge branch 'master' of https://github.com/marekcieplik/Breeding_rabbits

Conflicts:
	bunny.cpp
	bunny.h
	bunny.o
	farm.cpp
	farm_stat.cpp
	farm_stat.o
	main.cpp
	main.o
	rabbits/rabbits.layout
	rabbits_test/rabbits_test.cbp
	rabbits_test/rabbits_test.layout
	test.cpp
	test.o