merging master
Merge branch 'master' of github.com:mugu87/myApp
scss
fixing merging conflicts