added some checks
mergeconflicts
fixed egg stuff
Merge pull request #29 from red-admirals-2014/fixing_bugs

Fixing bugs