added emmet for editing
merged with remote master