reorganize variables
Merge branch 'master' of https://github.com/itsLulu/mtm4086-assignment2-sass-layout