Task 2
Merge branch 'master' into develop

* master:
  Task 3

Conflicts:
	index.html