Lucidstuck 142
Merge branch 'refs/heads-ro/master' of git@github.com:simon-clarkstone/mspa-fan-bits.git

Conflicts:
	mspafa-notes/lucidstuck.txt