conflitpc
Merge remote-tracking branch 'origin/master'

Conflicts:
	Kube(Git)/src/config.yml