Merge origin/master

Conflicts:
	sandglasses.c

added debug for printList