okej
asdMerge branch 'master' of https://github.com/rabotarabota2014/moe_testno_repo

Conflicts:
	bu