Changes made by XMPP Test 1 (xmpp.test1@gmail.com).
Merge branch 'master' of https://github.com/nmladenov/BDtest.git

Conflicts:
	project3/index3.html
Changes made by XMPP Test 1 (xmpp.test1@gmail.com).