SIGN IN SIGN UP

Merge branch 'master' into docker

D
Daniel Thompson committed
b9c084b0bf34da2316e78a575e5bd79098136214