fix font styles
fix conflict
 update scss files
Merge pull request #2 from dxii/develop

 fix font styles