Merge branch 'master' of github.com:andy-radkevich/bgmc

Conflicts:
	wp-config.php
Merge branch 'master' of github.com:andy-radkevich/bgmc

Conflicts:
	wp-config.php