Applied containable to bird and fish
Merge branch 'development' of https://github.com/teekaykern/csc150-group3-final.git into development