Merge origin/master
hi so i added this comment cause it represents the earth and the wind