Worked on the modularity of the scss files
Merge branch '0.1.0'