Edited the collisions and clouds
Merge branch 'master' of https://github.com/philiciachow/VideoGame
moved bird_test
resolve merge conflict