KA

KA
Merge branch

Conflicts:
	.DS_Store
	code/CurrentStuff/.DS_Store
	code/CurrentStuff/MQTT/.DS_Store
	content/.DS_Store