Diverse
Fix conflict
Updates html-validator to 0.0.3