Added viewport meta tag
Merge conflicts