Live server 0.0.2

Cleanup, bringing master forward