Tryna get shiiii working
Merge remote-tracking branch 'origin/master'

Conflicts:
	Tidying2/state_michael2/Collection.ino
	Tidying2/state_michael2/Whisker.h