fix order
Merge branch 'master' of github.com:designcommission/we_are_1 into staging