Changes made by Iva Koevska (admatha@gmail.com).
Merge branch 'master' of https://github.com/ikoevska/delete-conflicts.git

Conflicts:
	Blank/index.html