Changes made by Iva Koevska (apollyn@abv.bg).
Merge branch 'master' of https://github.com/ikoevska/new-repo.git

Conflicts:
	attitude/index.html