Merge branch 'Design-4'

Conflicts:
index.html