file structure BEM done & gulp update
merge conflict