Committed latest LOCAL changes.

Signed-off-by: Dom Pascal <dom@dompascal.com>
Merge branch 'master' of github.com:blackandblack/tide-and-pool