Changes made by Iva Koevska (admatha@gmail.com).
Merge branch 'master' of https://github.com/ikoevska/hello-world-2013-12-3.git

Conflicts:
	Hello World/index.html
Changes made by Iva Koevska (admatha@gmail.com).
Changes made by Iva Koevska (admatha@gmail.com).
Changes made by Iva Koevska (admatha@gmail.com).
Changes made by Iva Koevska (admatha@gmail.com).