Adding my final changes
Merge branch 'master' of github.com:bhrach/css-core-architecture

Trying to update branch.