2
3
Merge branch 'master' of https://github.com/parkito/labs_KG

Conflicts:
	2w.2s/Thumbs.db