Changes made by Svetozar Toskov (s.toskov@abv.bg).
Merge branch 'master' of https://github.com/stoskov/test5.git

Conflicts:
	test05/index.html
Changes made by Svetozar Toskov (s.toskov@abv.bg).
Merge branch 'master' of https://github.com/stoskov/test5.git
Changes made by Svetozar Toskov (s.toskov@abv.bg).
Merge branch 'master' of https://github.com/stoskov/test5.git

Conflicts:
	test05/index.html