new structure for scss (better modularity); bug fixing
Merge branch 'master' of https://github.com/carneades/carneades