Adding modification and creating conflict
Local change
Merge branch 'master' of https://github.com/nestor783/class3

Conflicts:
	index.html