started adding client
adding html content
corrected file extension
Merge branch 'feature1'