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

Conflicts:
	my-new-project/index.html
Changes made by Iva Koevska (admatha@gmail.com).