Merge branch 'master' of https://github.com/solidol/metod_web_prog

Conflicts:
	README.md