Feature 3
Merge branch 'feature'

Resolved conflict on	index.html