added eggs
Merge remote-tracking branch 'origin/master'

Conflicts:
	Flamingo/Flamingo/Source/nest.cpp
Merge remote-tracking branch 'origin/master'