other new cahnges
Merge branch 'master' of github.com:stodorov88/testgit

Conflicts:
	pages.html.txt