right/left spikes
Merge remote-tracking branch 'origin/master'

Conflicts:
	Thermo/src/Spike.as
Merge branch 'master' of https://github.com/water-bears/thermo