Fixed conflicts
Regenerated CSS
Merge pull request #58 from HugoGiraudel/master

Fixed conflicts and regenerated CSS files