Moving to SassDoc compliant comments
Fixing conflicts.
Removing a useless comment
Moving a 2-spaces comment to 4-spaces
Removed a useless comment and fixed a syntax typo
Merge pull request #7 from HugoGiraudel/master

Moving to SassDoc compliant comments